Fixed weird Github conflict stuff