shit wont let me merge