minor updates
pay is now half way
fixing conflict