Still resolving merge conflicts