Fixed the annoying merge issues, for real this time.