This issue is associated with the task of fixing a minor merge conflict caused by parallell changes in the same .css file