This will make merging between the two branches easier
This will make merging between the two branches easier