more apache config tweaks
resolve conflicts