Cleaning something
resolved merge issues