hopefully last commit
merging
remove conflict code