I dont know if i merged properly