Working after merge