added the [conflict] file back

not sure the purpose of this file, but UDK keeps creating it...