going back to square 1 to fix merge conflict