Fixed wrong git conflict resolve