Removed shebangs from tests
resolved conflicts