merged our shit