remove git conflicts