Visibility & Pay
saving before html is integrated
Html intergration to start from now
Now merging before html integration
Conflicts on poll controller was resolved simply by overwriting the merged file with local file. After all there was just one person working on it and local copy is the final copy