fixed git conflicts and commented swift errors