added lines to try create merge conflict
added empty lines in css styles element