Adjusting shit after merge