fixed random merge problems
Commit