Resolved all conflicts
Added what needs to happen next