Priya
resolved conflicts in login and log files