Deleted wierd merge issues.