Adding after strange merge