Rejected commit: Default
Rejected commit: Default
Merge remote-tracking branch 'origin/Alexander'

Conflicts:
	src/main/resources/locators.properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/core/pages/Header.java
	src/main/resources/locators.properties