Deleted local conflicted files

Signed-off-by: Arné Schreuder <arn3@arn3.com>