added ff merged file
changes commited