@scribu does moving this to the main file make sense and alleviate the conflict?