little merge issues...