Resolved merge conflicts in previous pull