Resolve conflict miss-commited