put ports.conf in the right place
removing merge conflicts
using only .conf extension