Done with updating branch on which I will be working in coding period, removed all conflicts, compilation and run-time error and updated test files in morning. After that studying software methodology. Later, I will discuss with mentor that anything is left to setup before starting of coding period.