fixed some weird merge conflict relicts in the source