Feature 1
feature 2.1 added
Feature 2.2 added
feature 3.1 added
feature 3.2 added
Finish Feature-3
feature 4.1
feature 5
feature 4.2 added
Finish Feature-4

Conflicts:
	a.php
Finish Release-1.0