Resolving merge issues
undo