Fixed merge a bit more