Was forced to commit
Trying to resolve conflict