Finish resloving merge conflict