Finish resolving merge conflict