Priority scheduling completed with test case passes 18/18
Resolved merge conflict