added .gitattributes (config.php merge=ours)