Fixed merge conflicts from ammend