Latest changes to avoid gitignore issues
merge_head