Fixed merge conflict + changes mentioned