thought yo there sounded better
fixed merge problem