new idea/version of project wise git control
fixed merge problem