I had recently merged two branches, bugFix(branch 1 ) with cssFix(branch 2) and it was successful . Basically what I did was I checked out into cssFix branch and merged bugF
