import os

def foo():
	"""
	This is crappy function. should be removed using git checkout
	"""
	return None

def bar():
	"""
	one more placeholder function for future usage. this is conflict line.
	"""
	return list()


def main():
	pass

if __name__ == '__main__':
	main()

import os

def foo():
	"""
	This is crappy function. should be removed using git checkout
	"""
	return None

def bar():
	"""
	one more placeholder function for future usage. this is conflict line.
	"""
	return set()


def main():
	pass

if __name__ == '__main__':
	main()

update list to set