ignoring android files
merging