got rid of annoying merge stuff