Resolved merge conflict with slashes after project-commands