Ignored make file
Conflict resolved.