Sorted out merge issues