commit before merge again
Commit after resolution again
So many Errors