Resolved merge after updated with problems solved at work