local changes
conflicts resolved
added css to post comments