COmmit
Resolved 1 conflict