Fixed wierd merge problem