test added at the first line
fixing conflict and merging