Function in Handler
Conflict Resolved
Commit after Conflicts