Cleaning up code and resolving merge conflict