Fixed wierd merge issues