Branchtestfile created
Pull cmd testing
Pull conflits removed
Test2 branch