Added note code
resolve conflicts