Conflicts resolved, push fixed