removed irrelevant test
resolved merge conflic