merging conflicts fixed?

Visit #17