getting it to work on the server, part 2
fixed conflicts