conflicts conflict make and fix master and feature1 both changed !!!! ECOND CHANDED BY MASTER! second change by feature1 third by fea third by master